b2f623
@@ -559,6 +559,8 @@
implements HMasterInterface, HMasterRegionInterface, MasterServices, Server {
     if (!catalogTracker.verifyRootRegionLocation(timeout)) {
       this.assignmentManager.assignRoot();
       this.catalogTracker.waitForRoot();
+      //This guarantees that the transition has completed
+      this.assignmentManager.waitForAssignment(HRegionInfo.ROOT_REGIONINFO);
       assigned++;
     } else {
       // Region already assigned.  We didnt' assign it.  Add to in-memory state.
